From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Wed, 22 May 2013 16:06:11 +0000 (-0400)
Subject: screenShield: Pop the modal immediately
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~4135
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=a2590164368fc28100a4475644f2d55827de3e7b;p=gnome-shell.git

screenShield: Pop the modal immediately

Allow people to start typing immediately after unlocking their
session, rather than having to wait for a transition.

https://bugzilla.gnome.org/show_bug.cgi?id=700847
---

diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index cfd55b95a..48cfaa604 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -1133,6 +1133,14 @@ const ScreenShield = new Lang.Class({
         if (Main.sessionMode.currentMode == 'unlock-dialog')
             Main.sessionMode.popMode('unlock-dialog');
 
+        if (this._dialog && !this._isGreeter)
+            this._dialog.popModal();
+
+        if (this._isModal) {
+            Main.popModal(this.actor);
+            this._isModal = false;
+        }
+
         Tweener.addTween(this._lockDialogGroup, {
             scale_x: 0,
             scale_y: 0,
@@ -1150,12 +1158,6 @@ const ScreenShield = new Lang.Class({
         }
 
         this._lightbox.hide();
-
-        if (this._isModal) {
-            Main.popModal(this.actor);
-            this._isModal = false;
-        }
-
         this.actor.hide();
 
         if (this._becameActiveId != 0) {